Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 13 May 2010 22:43:33 +0000 (22:43 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 13 May 2010 22:43:33 +0000 (22:43 +0000)

Trivial merge